auto merge of #220 : erickt/cargo/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 18 Jul 2014 15:32:10 +0000 (15:32 +0000)
committerbors <bors@rust-lang.org>
Fri, 18 Jul 2014 15:32:10 +0000 (15:32 +0000)
Please don't land this until https://github.com/wycats/hammer.rs/pull/12 is landed, or else it will break the build.


Trivial merge